Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #239 #250

Merged
merged 3 commits into from
May 7, 2020
Merged

Fix issue #239 #250

merged 3 commits into from
May 7, 2020

Conversation

AntoniusW
Copy link
Collaborator

@AntoniusW AntoniusW commented May 6, 2020

Fix bug in computation of backjumping level for violated unary nogoods in GroundConflictNoGoodLearner and related issue with erroneous storage
of conflicting out-of-order assignments in TrailAssignment. Fixes #239.

in GroundConflictNoGoodLearner and related issue with erroneous storage
of conflicting out-of-order assignments in TrailAssignment.
@AntoniusW AntoniusW requested a review from rtaupe May 6, 2020 02:02
@codecov
Copy link

codecov bot commented May 6, 2020

Codecov Report

Merging #250 into master will increase coverage by 0.30%.
The diff coverage is 77.77%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #250      +/-   ##
============================================
+ Coverage     76.79%   77.10%   +0.30%     
- Complexity     2052     2079      +27     
============================================
  Files           150      150              
  Lines          6780     6828      +48     
  Branches       1183     1197      +14     
============================================
+ Hits           5207     5265      +58     
+ Misses         1177     1166      -11     
- Partials        396      397       +1     
Impacted Files Coverage Δ Complexity Δ
...a/solver/learning/GroundConflictNoGoodLearner.java 79.00% <66.66%> (-0.43%) 45.00 <6.00> (+1.00) ⬇️
.../at/ac/tuwien/kr/alpha/solver/TrailAssignment.java 81.06% <100.00%> (+0.05%) 108.00 <4.00> (+1.00)
.../at/ac/tuwien/kr/alpha/grounder/NaiveGrounder.java 88.34% <0.00%> (+0.52%) 111.00% <0.00%> (+5.00%)
.../ac/tuwien/kr/alpha/common/terms/ConstantTerm.java 95.23% <0.00%> (+1.75%) 38.00% <0.00%> (+12.00%)
...va/at/ac/tuwien/kr/alpha/solver/DefaultSolver.java 62.19% <0.00%> (+1.76%) 59.00% <0.00%> (+2.00%)
.../solver/heuristics/ChainedBranchingHeuristics.java 80.95% <0.00%> (+2.38%) 17.00% <0.00%> (+1.00%)
...ava/at/ac/tuwien/kr/alpha/config/SystemConfig.java 78.31% <0.00%> (+2.40%) 31.00% <0.00%> (+1.00%)
...en/kr/alpha/solver/heuristics/ReplayHeuristic.java 77.77% <0.00%> (+27.77%) 8.00% <0.00%> (+4.00%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 225fa87...6104a49. Read the comment docs.

Copy link
Collaborator

@rtaupe rtaupe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, great that you found the bug! 👍
Just one suggestion and one question.

…lictNoGoodLearner.java

Co-authored-by: Richard Taupe <richard.taupe@siemens.com>
@rtaupe rtaupe merged commit d5fbdf4 into master May 7, 2020
@rtaupe rtaupe deleted the fix_239 branch May 7, 2020 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Alpha mistakenly proves Hanoi instance to be UNSAT on add_simple_completion branch
2 participants